From f6324a7ce286a7644b22f8eb107c7f8040008faf Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk[cl349]" Date: Thu, 5 May 2005 14:29:20 +0000 Subject: [PATCH] bitkeeper revision 1.1389.8.1 (427a2dc0yjvEz3OVwiOMxO61skasFg) Fix installing fixmap_nocache entries, as used by PCI_MMCONFIG. fixmap.h: Address passed to set_fixmap_nocache is a machine-address -- install it as such. Kconfig: Re-enable PCI_MMCONFIG. Signed-off-by: Christian Limpach --- linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig | 2 +- linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h | 2 +- linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig index 3e6ed34755..3ed45ade7b 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig @@ -788,7 +788,7 @@ config PCI_MMCONFIG bool depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI)) select ACPI_BOOT - default n + default y source "drivers/pci/pcie/Kconfig" diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h index cce81a570c..c79f8a94a0 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h @@ -117,7 +117,7 @@ extern void __set_fixmap_ma (enum fixed_addresses idx, * Some hardware wants to get fixmapped without caching. */ #define set_fixmap_nocache(idx, phys) \ - __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) + __set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE) #define clear_fixmap(idx) \ __set_fixmap(idx, 0, __pgprot(0)) diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h index dbb7043961..1947a09544 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/fixmap.h @@ -75,7 +75,7 @@ extern void __set_fixmap_ma (enum fixed_addresses idx, * Some hardware wants to get fixmapped without caching. */ #define set_fixmap_nocache(idx, phys) \ - __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) + __set_fixmap_ma(idx, phys, PAGE_KERNEL_NOCACHE) #define clear_fixmap(idx) \ __set_fixmap(idx, 0, __pgprot(0)) -- 2.30.2